sync minor clenup

diff --git a/gtk/gtktreemodelsort.c b/gtk/gtktreemodelsort.c
index 13ca9160da8122bb923f1eb55ff485b9f2fe978a..8977e5ba8c3cb82d2a157d3e7cc2788b77c76267 100644 (file)
--- a/gtk/gtktreemodelsort.c
+++ b/gtk/gtktreemodelsort.c
@@ -677,7 +677,6 @@ gtk_tree_model_sort_rows_reordered (GtkTreeModel *s_model,
                                    gpointer      data)
 {
   int i;
-  int len;
   SortElt *elt;
   SortLevel *level;
   
@@ -686,47 +685,25 @@ gtk_tree_model_sort_rows_reordered (GtkTreeModel *s_model,
 
   GtkTreeModelSort *tree_model_sort = GTK_TREE_MODEL_SORT (data);
   
-  g_return_if_fail (s_path != NULL && s_iter != NULL);
+  g_return_if_fail (s_iter != NULL);
   g_return_if_fail (new_order != NULL);
 
-  if (!gtk_tree_path_get_indices (s_path))
-    len = gtk_tree_model_iter_n_children (s_model, NULL);
-  else
-    len = gtk_tree_model_iter_n_children (s_model, s_iter);
-
-  if (len < 2)
+  if (s_path == NULL || gtk_tree_path_get_indices (s_path) == NULL)
     {
-      return;
+      if (tree_model_sort->root == NULL)
+       return;
+      level = SORT_LEVEL (tree_model_sort->root);
     }
-
-  /** get correct sort level **/
-
-  if (!gtk_tree_path_get_indices (s_path))
-    level = SORT_LEVEL (tree_model_sort->root);
   else
     {
-      path = gtk_tree_model_sort_convert_child_path_to_path (tree_model_sort,
-                                                            s_path);
-      
-      if (!path)
-       {
-         return;
-       }
+      path = gtk_real_tree_model_sort_convert_child_path_to_path (tree_model_sort, s_path, FALSE);
+      if (path == NULL)
+       return;
+      gtk_tree_model_get_iter (GTK_TREE_MODEL (data), &iter, path);
+      gtk_tree_path_free (path);
 
-      if (!gtk_tree_model_get_iter (GTK_TREE_MODEL (data), &iter, path))
-       {
-         /* no iter for me */
-         gtk_tree_path_free (path);
-         return;
-       }
-      
       level = SORT_LEVEL (iter.user_data);
       elt = SORT_ELT (iter.user_data2);
-      gtk_tree_path_free (path);
-
-      /* FIXME: is this needed ? */
-      if (!s_iter)
-       gtk_tree_model_get_iter (s_model, s_iter, s_path);
 
       if (!elt->children)
        return;
@@ -734,18 +711,8 @@ gtk_tree_model_sort_rows_reordered (GtkTreeModel *s_model,
       level = elt->children;
     }
 
-  if (!level)
-    {
-      /* ignore signal */
-      return;
-    }
-
-  if (len != level->array->len)
-    {
-      /* length mismatch, pretty bad, shouldn't happen */
-      
-      return;
-    }
+  if (level->array->len < 2)
+    return;
   
   /** unsorted: set offsets, resort without reordered emission **/
   if (tree_model_sort->sort_column_id == -1)
@@ -800,7 +767,6 @@ gtk_tree_model_sort_rows_reordered (GtkTreeModel *s_model,
       new_order[g_array_index (level->array, SortElt, i).offset];
 
   gtk_tree_model_sort_increment_stamp (tree_model_sort);
-
 }
 
 /* Fulfill our model requirements */

diff --git a/tests/testtreesort.c b/tests/testtreesort.c
index 33313311cbefb3d0c3c05397ed4282a0296e830c..3b18be6f0d9d773eba8ec0d94b6586150530d4de 100644 (file)
--- a/tests/testtreesort.c
+++ b/tests/testtreesort.c
@@ -98,7 +98,9 @@ main (int argc, char *argv[])
   for (i = 0; data[i].word_1 != NULL; i++)
     {
       gint k;
-      
+      GtkTreeIter child_iter;
+
+
       gtk_tree_store_prepend (GTK_TREE_STORE (model), &iter, NULL);
       gtk_tree_store_set (GTK_TREE_STORE (model), &iter,
                          WORD_COLUMN_1, data[i].word_1,
@@ -106,11 +108,16 @@ main (int argc, char *argv[])
                          WORD_COLUMN_3, data[i].word_3,
                          WORD_COLUMN_4, data[i].word_4,
                          -1);
-      
+
+      gtk_tree_store_append (GTK_TREE_STORE (model), &child_iter, &iter);
+      gtk_tree_store_set (GTK_TREE_STORE (model), &child_iter,
+                         WORD_COLUMN_1, data[i].word_1,
+                         WORD_COLUMN_2, data[i].word_2,
+                         WORD_COLUMN_3, data[i].word_3,
+                         WORD_COLUMN_4, data[i].word_4,
+                         -1);
       for (k = 0; childdata[k].word_1 != NULL; k++)
        {
-         GtkTreeIter child_iter;
-         
          gtk_tree_store_append (GTK_TREE_STORE (model), &child_iter, &iter);
          gtk_tree_store_set (GTK_TREE_STORE (model), &child_iter,
                              WORD_COLUMN_1, childdata[k].word_1,
@@ -305,7 +312,7 @@ main (int argc, char *argv[])
       gtk_window_set_default_size (GTK_WINDOW (window3), 400, 400);
       gtk_widget_show_all (window3);
     }
-  
+#if 0  
   for (i = 0; data[i].word_1 != NULL; i++)
     {
       gint k;
@@ -330,7 +337,7 @@ main (int argc, char *argv[])
                              -1);
        }
     }
-  
+#endif  
   gtk_main ();
   
   return 0;